feat: Manage prometheus resources by tolusha · Pull Request #2117 · eclipse-che/che-operator

tolusha · 2026-04-13T12:14:17Z

What does this PR do?

New metrics package (pkg/deploy/metrics/) — a new reconciler that manages Prometheus resources:
- ServiceMonitor objects for both Che Server (che-host) and DWO (devworkspace-controller)
- RBAC (Role + RoleBinding) granting the prometheus-k8s service account access to scrape metrics endpoints
- Adds the openshift.io/cluster-monitoring: "true" label to the operator namespace so OpenShift's built-in monitoring stack discovers the ServiceMonitors

Screenshot/screencast of this PR

N/A

What issues does this PR fix or reference?

https://redhat.atlassian.net/browse/CRW-8629
https://redhat.atlassian.net/browse/CRW-8589
https://redhat.atlassian.net/browse/CRW-8315

How to test this PR?

Deploy Eclipse Che, start a workspace
Ensure that me collect devworkspace and che-server specific metrics without creating any additional resources
https://eclipse.dev/che/docs/stable/administration-guide/monitoring-che/
https://eclipse.dev/che/docs/stable/administration-guide/monitoring-the-dev-workspace-operator/

Common Test Scenarios

Deploy Eclipse Che
Start an empty workspace
Open terminal and build/run an image
Stop a workspace
Check operator logs for reconciliation errors or infinite reconciliation loops

PR Checklist

As the author of this Pull Request I made sure that:

Reviewers

Reviewers, please comment how you tested the PR when approving it.

openshift-ci · 2026-04-13T12:14:23Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

openshift-ci · 2026-04-13T12:14:25Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: tolusha

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

tolusha · 2026-05-13T10:55:05Z

/retest

rohanKanojia · 2026-05-14T13:16:00Z

+		Rules: []rbacv1.PolicyRule{
+			{
+				APIGroups: []string{""},
+				Resources: []string{"services", "endpoints", "pods"},


Sorry, I might not have the full context. Why is pods needed?

I not 100% sure, probably some requirements
https://eclipse.dev/che/docs/stable/administration-guide/monitoring-che/

tolusha · 2026-05-14T14:21:08Z

Hi! I'm che-ai-assistant — I help with your pull requests.

Available commands:

/che-ai-assistant generate-che-doc — Generate a documentation PR based on this PR's changes
/che-ai-assistant ok-pr-review — Run a comprehensive PR review (summary, code review, deep review, impact analysis)
/che-ai-assistant help — Show this help message

rohanKanojia · 2026-05-14T16:32:27Z

While testing it I observe that ServiceMonitor for devworkspace gets created but che-host is not getting created.

On installing Eclipse Che based on these changes and creating a DevWorkspace.

ServiceMonitor got created:

kubectl get servicemonitor -neclipse-che                                                                                                                                            
NAME           AGE
devworkspace   106s

Role/RoleBinding got created:

kubectl get role -neclipse-che | grep prometheus
devworkspace-prometheus                                           2026-05-14T15:39:05Z

kubectl get rolebinding -neclipse-che | grep prometheus
devworkspace-prometheus                                           Role/devworkspace-prometheus                                           2m17s

These get garbage collected when CheCluster gets deleted, confirming ownerReference is working correctly.

How to enable Che equivalent resources? I can confirm metrics is enabled in CheCluster CR:

oc get checluster -o yaml | grep -A2  metrics                                                                                                                          
      metrics:
        enable: true
      pluginRegistry:

rohanKanojia · 2026-05-14T16:48:28Z

+)
+
+const (
+	cheServerServiceMonitorNameTemplate        = "%s"


nit, IMHO this does not add much value vs using defaults.GetCheFlavor() directly

It leads to some issues during running unit tests.
So, everything having defaults.GetCheFlavor() can't be defined in var/const

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

tolusha · 2026-05-15T11:00:58Z

@rohanKanojia
Thank you for noticing that. It has been fixed.

While testing it I observe that ServiceMonitor for devworkspace gets created but che-host is not getting created.
fixed

tolusha · 2026-05-15T12:38:14Z

/retest

tolusha · 2026-05-15T13:14:42Z

/che-ai-assistant generate-che-doc

Created documentation PR: eclipse-che/che-docs#3106

openshift-ci · 2026-05-15T14:11:44Z

@tolusha: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/v19-devworkspace-happy-path	`2d1be20`	link	true	`/test v19-devworkspace-happy-path`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-ci Bot added the do-not-merge/work-in-progress label Apr 13, 2026

tolusha mentioned this pull request Apr 14, 2026

docs: Update monitoring docs for automated Prometheus resource management eclipse-che/che-docs#3066

Closed

5 tasks

openshift-ci Bot added the needs-rebase label Apr 14, 2026

tolusha force-pushed the servicemonitor branch from 5e438c8 to 75a9ef9 Compare April 14, 2026 15:00

openshift-ci Bot added needs-rebase and removed needs-rebase labels Apr 14, 2026

tolusha force-pushed the servicemonitor branch from 7e203b7 to f4a181a Compare May 11, 2026 12:18

tolusha added 2 commits May 11, 2026 17:47

feat: Manage prometheus resources

0360b3f

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

fixup

7ac2087

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

tolusha force-pushed the servicemonitor branch from f4a181a to 7ac2087 Compare May 11, 2026 15:50

openshift-ci Bot removed the needs-rebase label May 11, 2026

This was referenced May 12, 2026

Document automatic Prometheus resource management eclipse-che/che-docs#3095

Closed

docs: Document automated Prometheus metrics management eclipse-che/che-docs#3096

Closed

tolusha added 5 commits May 13, 2026 09:31

fixes

2f1a828

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

fixes

8bff453

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

fixes

7804a40

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

fixes

aededc3

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

fixes

1fd7729

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

tolusha marked this pull request as ready for review May 13, 2026 08:47

tolusha requested review from SDawley, dkwon17, ibuziuk and mkuznyetsov as code owners May 13, 2026 08:47

openshift-ci Bot removed the do-not-merge/work-in-progress label May 13, 2026

fixes

7fa0d19

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

tolusha requested review from akurinnoy and rohanKanojia May 13, 2026 09:38

rohanKanojia reviewed May 14, 2026

View reviewed changes

tolusha mentioned this pull request May 14, 2026

docs: Update Prometheus monitoring to reflect automated resource management eclipse-che/che-docs#3101

Closed

5 tasks

rohanKanojia reviewed May 14, 2026

View reviewed changes

udpate dev resources

2d1be20

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

tolusha mentioned this pull request May 15, 2026

docs: Update monitoring procedures for automated Prometheus resource management eclipse-che/che-docs#3106

Draft

5 tasks

Conversation

tolusha commented Apr 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Screenshot/screencast of this PR

What issues does this PR fix or reference?

How to test this PR?

Common Test Scenarios

PR Checklist

Reviewers

Uh oh!

openshift-ci Bot commented Apr 13, 2026

Uh oh!

openshift-ci Bot commented Apr 13, 2026

Uh oh!

tolusha commented May 13, 2026

Uh oh!

rohanKanojia May 14, 2026

Choose a reason for hiding this comment

Uh oh!

tolusha May 15, 2026

Choose a reason for hiding this comment

Uh oh!

tolusha commented May 14, 2026

Uh oh!

rohanKanojia commented May 14, 2026

Uh oh!

rohanKanojia May 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tolusha May 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tolusha commented May 15, 2026

Uh oh!

tolusha commented May 15, 2026

Uh oh!

tolusha commented May 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented May 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

tolusha commented Apr 13, 2026 •

edited

Loading

rohanKanojia May 14, 2026 •

edited

Loading

tolusha May 15, 2026 •

edited

Loading

tolusha commented May 15, 2026 •

edited

Loading